From a7b536015a7a6daba8d77fa88cf1f967eb47a8fd Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Mon, 22 Sep 2003 02:03:50 +0000
Subject: [PATCH] Massive search-and-replace to eliminate non-unneeded args
 being passed to the read and write inits. gpx.c had non-mechanical changes
 for logpoint and urlbase options.

---
 gpsbabel/cetus.c     |  4 ++--
 gpsbabel/copilot.c   |  4 ++--
 gpsbabel/defs.h      |  2 +-
 gpsbabel/easygps.c   |  4 ++--
 gpsbabel/garmin.c    |  2 +-
 gpsbabel/gcdb.c      |  4 ++--
 gpsbabel/geo.c       |  6 +++---
 gpsbabel/gpilots.c   |  4 ++--
 gpsbabel/gpsdrive.c  |  4 ++--
 gpsbabel/gpspilot.c  |  4 ++--
 gpsbabel/gpsutil.c   |  4 ++--
 gpsbabel/gpx.c       | 13 ++++++-------
 gpsbabel/holux.c     |  4 ++--
 gpsbabel/magnav.c    |  4 ++--
 gpsbabel/magproto.c  |  6 +++---
 gpsbabel/main.c      |  8 ++++----
 gpsbabel/mapopolis.c |  4 ++--
 gpsbabel/mapsend.c   |  4 ++--
 gpsbabel/mapsource.c |  4 ++--
 gpsbabel/navicache.c |  6 +++---
 gpsbabel/pcx.c       |  4 ++--
 gpsbabel/psp.c       |  4 ++--
 gpsbabel/quovadis.c  |  4 ++--
 gpsbabel/saroute.c   |  6 ++----
 gpsbabel/tiger.c     |  4 ++--
 gpsbabel/tmpro.c     |  4 ++--
 gpsbabel/tpg.c       |  4 ++--
 gpsbabel/xcsv.c      |  4 ++--
 28 files changed, 63 insertions(+), 66 deletions(-)

diff --git a/gpsbabel/cetus.c b/gpsbabel/cetus.c
index bc6c2ecc3..ac48612ba 100644
--- a/gpsbabel/cetus.c
+++ b/gpsbabel/cetus.c
@@ -87,7 +87,7 @@ arglist_t cetus_args[] = {
 };
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
 	file_in = fopen(fname, "rb");
 	if (file_in == NULL) {
@@ -106,7 +106,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
 	file_out = fopen(fname, "wb");
 	out_fname = fname;
diff --git a/gpsbabel/copilot.c b/gpsbabel/copilot.c
index 1147b4aac..7a15bdb0e 100644
--- a/gpsbabel/copilot.c
+++ b/gpsbabel/copilot.c
@@ -49,7 +49,7 @@ struct pdb *opdb;
 struct pdb_record *opdb_rec;
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
 	file_in = fopen(fname, "rb");
 	if (file_in == NULL) {
@@ -64,7 +64,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
 	file_out = fopen(fname, "wb");
 	out_fname = fname;
diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 9684c947f..fea48868d 100644
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -173,7 +173,7 @@ typedef struct {
 	int rte_waypt_ct;		/* # waypoints in waypoint list */
 } route_head;
 
-typedef void (*ff_init) (char const *, char const *);
+typedef void (*ff_init) (char const *);
 typedef void (*ff_deinit) (void);
 typedef void (*ff_read) (void);
 typedef void (*ff_write) (void);
diff --git a/gpsbabel/easygps.c b/gpsbabel/easygps.c
index 533fc384c..d7952e40d 100644
--- a/gpsbabel/easygps.c
+++ b/gpsbabel/easygps.c
@@ -36,7 +36,7 @@ arglist_t easygps_args[] = {
 };
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
 	char ibuf[100] = {'0'} ;
 	const char *ezsig = "TerraByte Location File";
@@ -61,7 +61,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
 	file_out = fopen(fname, "wb");
 	mkshort_handle = mkshort_new_handle();
diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c
index c1202fda2..0e4d21596 100644
--- a/gpsbabel/garmin.c
+++ b/gpsbabel/garmin.c
@@ -30,7 +30,7 @@ static const char *portname;
 static void *mkshort_handle;
 
 static void
-rw_init(const char *fname, const char *opts)
+rw_init(const char *fname)
 {
 	if (!mkshort_handle)
 		mkshort_handle = mkshort_new_handle();
diff --git a/gpsbabel/gcdb.c b/gpsbabel/gcdb.c
index 9a9c7b364..39d44b0e9 100644
--- a/gpsbabel/gcdb.c
+++ b/gpsbabel/gcdb.c
@@ -57,7 +57,7 @@ static char *tbuf = NULL;
 static char *tbufp = NULL;
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
 	file_in = fopen(fname, "rb");
 	if (file_in == NULL) {
@@ -72,7 +72,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
 	file_out = fopen(fname, "wb");
 	out_fname = fname;
diff --git a/gpsbabel/geo.c b/gpsbabel/geo.c
index 0957387a6..f5d6da537 100644
--- a/gpsbabel/geo.c
+++ b/gpsbabel/geo.c
@@ -40,7 +40,7 @@ FILE *ofd;
 
 #if NO_EXPAT
 void
-geo_rd_init(const char *fname, const char *args)
+geo_rd_init(const char *fname)
 {
 	fatal(MYNAME ": This build excluded GPX support becuase expat was not installed.\n");
 }
@@ -185,7 +185,7 @@ geo_cdata(void *dta, const XML_Char *s, int len)
 }
 
 void
-geo_rd_init(const char *fname, const char *args)
+geo_rd_init(const char *fname)
 {
 	fd = fopen(fname, "r");
 	if (fd == NULL) {
@@ -235,7 +235,7 @@ geo_rd_deinit(void)
 }
 
 void
-geo_wr_init(const char *fname, const char *args)
+geo_wr_init(const char *fname)
 {
 	ofd = fopen(fname, "w");
 	if (ofd == NULL) {
diff --git a/gpsbabel/gpilots.c b/gpsbabel/gpilots.c
index e9dce03cd..92f437df3 100644
--- a/gpsbabel/gpilots.c
+++ b/gpsbabel/gpilots.c
@@ -122,7 +122,7 @@ arglist_t my_args[] = {
 };
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
 	file_in = fopen(fname, "rb");
 	if (file_in == NULL) {
@@ -141,7 +141,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
 	file_out = fopen(fname, "wb");
 	out_fname = fname;
diff --git a/gpsbabel/gpsdrive.c b/gpsbabel/gpsdrive.c
index 2db56a99b..1fb701ab1 100644
--- a/gpsbabel/gpsdrive.c
+++ b/gpsbabel/gpsdrive.c
@@ -39,7 +39,7 @@ static void *mkshort_rd_handle;
 #define MYNAME "GPSDRIVE"
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
 	file_in = fopen(fname, "r");
 	if (file_in == NULL) {
@@ -54,7 +54,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
 	file_out = fopen(fname, "w");
 	if (file_out == NULL) {
diff --git a/gpsbabel/gpspilot.c b/gpsbabel/gpspilot.c
index f494b3b3e..36805443d 100644
--- a/gpsbabel/gpspilot.c
+++ b/gpsbabel/gpspilot.c
@@ -59,7 +59,7 @@ arglist_t gpspilot_args[] = {
 };
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
 	file_in = fopen(fname, "rb");
 	if (file_in == NULL) {
@@ -78,7 +78,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
 	file_out = fopen(fname, "wb");
 	out_fname = fname;
diff --git a/gpsbabel/gpsutil.c b/gpsbabel/gpsutil.c
index 72508b386..a0410ba66 100644
--- a/gpsbabel/gpsutil.c
+++ b/gpsbabel/gpsutil.c
@@ -12,7 +12,7 @@ static void *mkshort_handle;
 #define MYNAME "GPSUTIL"
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
 	file_in = fopen(fname, "r");
 	if (file_in == NULL) {
@@ -27,7 +27,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
 	file_out = fopen(fname, "w");
 	if (file_out == NULL) {
diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c
index 62c67b2fd..01c021587 100644
--- a/gpsbabel/gpx.c
+++ b/gpsbabel/gpx.c
@@ -53,7 +53,7 @@ static int in_number;
 
 static xml_tag *cur_tag;
 static char *cdatastr;
-static int opt_logpoint = 0;
+static char *opt_logpoint = NULL;
 static int logpoint_ct = 0;
 
 static const char *gpx_version;
@@ -674,7 +674,7 @@ gpx_end(void *data, const char *el)
 
 #if NO_EXPAT
 void
-gpx_rd_init(const char *fname, const char *args)
+gpx_rd_init(const char *fname)
 {
 	fatal(MYNAME ": This build excluded GPX support becuase expat was not installed.\n");
 }
@@ -744,7 +744,7 @@ gpx_cdata(void *dta, const XML_Char *s, int len)
 }
 
 void
-gpx_rd_init(const char *fname, const char *args)
+gpx_rd_init(const char *fname)
 {
 	if ( fname[0] ) {
 	        fd = fopen(fname, "r");
@@ -758,8 +758,6 @@ gpx_rd_init(const char *fname, const char *args)
 		input_string_len = strlen(input_string);
 	}
 
-        if (get_option(args, "logpoint") != NULL)
-            opt_logpoint = 1;
 
 	file_time = 0;
 	
@@ -785,10 +783,9 @@ gpx_rd_deinit(void)
 }
 
 void
-gpx_wr_init(const char *fname, const char *args)
+gpx_wr_init(const char *fname)
 {
 	mkshort_handle = mkshort_new_handle();
-	urlbase = get_option(args, "urlbase");
 
 	ofd = fopen(fname, "w");
 	if (ofd == NULL) {
@@ -1198,6 +1195,8 @@ arglist_t gpx_args[] = {
 	{ "snlen", &snlen, "Length of generated shortnames", ARGTYPE_INT },
 	{ "suppresswhite", &suppresswhite, 
 		"Suppress whitespace in generated shortnames", ARGTYPE_BOOL },
+	{ "logpoint", &opt_logpoint, "Create waypoints from geocache log entries", ARGTYPE_BOOL },
+	{ "urlbase", &urlbase, "Base URL for link tag in output", ARGTYPE_STRING},
 	{ 0, 0, 0, 0 }
 };
 
diff --git a/gpsbabel/holux.c b/gpsbabel/holux.c
index 3a1e8091d..14e1a9373 100644
--- a/gpsbabel/holux.c
+++ b/gpsbabel/holux.c
@@ -38,7 +38,7 @@ static  void *mkshort_handle;
 static  char fOutname[256];
 
 
-static void rd_init(const char *fname, const char *args)
+static void rd_init(const char *fname)
 {
 	file_in = fopen(fname, "rb");
 	if (file_in == NULL) {
@@ -57,7 +57,7 @@ static void rd_deinit(void)
 
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
 	mkshort_handle = mkshort_new_handle();
 
diff --git a/gpsbabel/magnav.c b/gpsbabel/magnav.c
index 8d61b2600..269c1313d 100644
--- a/gpsbabel/magnav.c
+++ b/gpsbabel/magnav.c
@@ -58,7 +58,7 @@ struct pdb *opdb;
 struct pdb_record *opdb_rec;
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
 	file_in = fopen(fname, "rb");
 	if (file_in == NULL) {
@@ -73,7 +73,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
 	file_out = fopen(fname, "wb");
 	out_fname = fname;
diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c
index 9792aa8f1..4f19669e9 100644
--- a/gpsbabel/magproto.c
+++ b/gpsbabel/magproto.c
@@ -697,7 +697,7 @@ arglist_t mag_args[] = {
 };
 
 static void
-mag_rd_init(const char *portname, const char *args)
+mag_rd_init(const char *portname)
 {
 	time_t now, later;
 
@@ -748,7 +748,7 @@ mag_rd_init(const char *portname, const char *args)
 }
 
 static void
-mag_wr_init(const char *portname, const char *args)
+mag_wr_init(const char *portname)
 {
 #if __WIN32__
 	if (!terminit(portname)) {
@@ -788,7 +788,7 @@ mag_wr_init(const char *portname, const char *args)
 			xCloseHandle(comport);
 		}
 #endif
-		mag_rd_init(portname, args);
+		mag_rd_init(portname);
 	}
 	QUEUE_INIT(&rte_wpt_tmp);
 }
diff --git a/gpsbabel/main.c b/gpsbabel/main.c
index e005f7eea..27a6ef470 100644
--- a/gpsbabel/main.c
+++ b/gpsbabel/main.c
@@ -133,7 +133,7 @@ main(int argc, char *argv[])
 				if (ivecs == NULL) {
 					fatal ("No valid input type specified\n");
 				}
-				ivecs->rd_init(fname, ivec_opts);
+				ivecs->rd_init(fname);
 				ivecs->read();
 				ivecs->rd_deinit();
 				break;
@@ -142,7 +142,7 @@ main(int argc, char *argv[])
 					? argv[argn]+2 : argv[++argn];
 				ofname = optarg;
 				if (ovecs) {
-					ovecs->wr_init(ofname, ovec_opts);
+					ovecs->wr_init(ofname);
 					ovecs->write();
 					ovecs->wr_deinit();
 				}
@@ -205,11 +205,11 @@ main(int argc, char *argv[])
 		fatal ("Extra arguments on command line\n");
 	}
 	else if (argc && ivecs) {
-		ivecs->rd_init(argv[0], ivec_opts);
+		ivecs->rd_init(argv[0]);
 		ivecs->read();
 		ivecs->rd_deinit();
 		if (argc == 2 && ovecs) {
-			ovecs->wr_init(argv[1], ovec_opts);
+			ovecs->wr_init(argv[1]);
 			ovecs->write();
 			ovecs->wr_deinit();
 		}
diff --git a/gpsbabel/mapopolis.c b/gpsbabel/mapopolis.c
index f7d7540ff..a6bf20e0f 100644
--- a/gpsbabel/mapopolis.c
+++ b/gpsbabel/mapopolis.c
@@ -73,7 +73,7 @@ struct pdb *opdb;
 struct pdb_record *opdb_rec;
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
 	file_in = fopen(fname, "rb");
 	if (file_in == NULL) {
@@ -88,7 +88,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
 	file_out = fopen(fname, "wb");
 	out_fname = fname;
diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c
index d1aafdc7d..43da0edca 100644
--- a/gpsbabel/mapsend.c
+++ b/gpsbabel/mapsend.c
@@ -54,7 +54,7 @@ test_endianness(void)
 }
 
 static void
-mapsend_rd_init(const char *fname, const char *args)
+mapsend_rd_init(const char *fname)
 {
 	mapsend_file_in = fopen(fname, "rb");
 	if (mapsend_file_in == NULL) {
@@ -169,7 +169,7 @@ my_fwrite4(int *ptr, FILE *stream)
 }
 
 static void
-mapsend_wr_init(const char *fname, const char *args)
+mapsend_wr_init(const char *fname)
 {
 	mapsend_file_out = fopen(fname, "wb");
 	if (mapsend_file_out == NULL) {
diff --git a/gpsbabel/mapsource.c b/gpsbabel/mapsource.c
index 5ebc91894..23ca79d69 100644
--- a/gpsbabel/mapsource.c
+++ b/gpsbabel/mapsource.c
@@ -105,7 +105,7 @@ mps_find_icon_number_from_desc(const char *desc, garmin_formats_e garmin_format)
 }
 
 static void
-mps_rd_init(const char *fname, const char *args)
+mps_rd_init(const char *fname)
 {
 	mps_file_in = fopen(fname, "rb");
 	if (mps_file_in == NULL) {
@@ -120,7 +120,7 @@ mps_rd_deinit(void)
 }
 
 static void
-mps_wr_init(const char *fname, const char *args)
+mps_wr_init(const char *fname)
 {
 	mps_file_out = fopen(fname, "wb");
 	if (mps_file_out == NULL) {
diff --git a/gpsbabel/navicache.c b/gpsbabel/navicache.c
index fc5eb9950..929073730 100644
--- a/gpsbabel/navicache.c
+++ b/gpsbabel/navicache.c
@@ -32,7 +32,7 @@ FILE *ofd;
 
 #if NO_EXPAT
 void
-nav_rd_init(const char *fname, const char *args)
+nav_rd_init(const char *fname)
 {
 	fatal(MYNAME ": This build excluded GPX support becuase expat was not installed.\n");
 }
@@ -149,7 +149,7 @@ nav_end(void *data, const char *el)
 }
 
 void
-nav_rd_init(const char *fname, const char *args)
+nav_rd_init(const char *fname)
 {
 	fd = fopen(fname, "r");
 	if (fd == NULL) {
@@ -190,7 +190,7 @@ nav_rd_deinit(void)
 }
 
 void
-nav_wr_init(const char *fname, const char *args)
+nav_wr_init(const char *fname)
 {
 	fatal(MYNAME ": Does not support writing Navicache files.\n");
 	ofd = fopen(fname, "w");
diff --git a/gpsbabel/pcx.c b/gpsbabel/pcx.c
index 6f8c96001..e1a989484 100644
--- a/gpsbabel/pcx.c
+++ b/gpsbabel/pcx.c
@@ -37,7 +37,7 @@ arglist_t pcx_args[] = {
 };
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
 	file_in = fopen(fname, "r");
 	if (file_in == NULL) {
@@ -52,7 +52,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
 	file_out = fopen(fname, "w");
 	mkshort_handle = mkshort_new_handle();
diff --git a/gpsbabel/psp.c b/gpsbabel/psp.c
index 2451f57d1..b07657498 100644
--- a/gpsbabel/psp.c
+++ b/gpsbabel/psp.c
@@ -242,7 +242,7 @@ buffer_washer(char * buff, int buffer_len)
 }
 
 static void
-psp_rd_init(const char *fname, const char *args)
+psp_rd_init(const char *fname)
 {
 	psp_file_in = fopen(fname, "rb");
 	if (psp_file_in == NULL) {
@@ -257,7 +257,7 @@ psp_rd_deinit(void)
 }
 
 static void
-psp_wr_init(const char *fname, const char *args)
+psp_wr_init(const char *fname)
 {
 	psp_file_out = fopen(fname, "wb");
 	mkshort_handle = mkshort_new_handle();
diff --git a/gpsbabel/quovadis.c b/gpsbabel/quovadis.c
index 4d0b9ad67..3cc67243f 100644
--- a/gpsbabel/quovadis.c
+++ b/gpsbabel/quovadis.c
@@ -74,7 +74,7 @@ static int wpt_to_icon(geocache_type	type) {
 }
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
 	file_in = fopen(fname, "rb");
 	if (file_in == NULL) {
@@ -93,7 +93,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
 	file_out = fopen(fname, "wb");
 	out_fname = fname;
diff --git a/gpsbabel/saroute.c b/gpsbabel/saroute.c
index 14923e86b..40110825e 100644
--- a/gpsbabel/saroute.c
+++ b/gpsbabel/saroute.c
@@ -64,8 +64,7 @@ Skip(FILE * f,
 }
 
 static void
-rd_init(const char *fname,
-	const char *args)
+rd_init(const char *fname)
 {
 	infile = fopen(fname, "rb");
 	if (infile == NULL) {
@@ -225,8 +224,7 @@ my_read(void)
 }
 
 static void
-wr_init(const char *fname,
-	const char *args)
+wr_init(const char *fname)
 {
 	fatal(MYNAME ":Not enough information is known about this format to write it.\n");
 }
diff --git a/gpsbabel/tiger.c b/gpsbabel/tiger.c
index 0a95a1ecf..1f527361b 100644
--- a/gpsbabel/tiger.c
+++ b/gpsbabel/tiger.c
@@ -92,7 +92,7 @@ arglist_t tiger_args[] = {
 
 
 static void
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
 	file_in = fopen(fname, "r");
 	mkshort_handle = mkshort_new_handle();
@@ -110,7 +110,7 @@ rd_deinit(void)
 }
 
 static void
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
 	file_out = fopen(fname, "w");
 	thresh_days = strtod(oldthresh, NULL);
diff --git a/gpsbabel/tmpro.c b/gpsbabel/tmpro.c
index 8bc695659..1343a72d7 100644
--- a/gpsbabel/tmpro.c
+++ b/gpsbabel/tmpro.c
@@ -43,7 +43,7 @@ static FILE *file_out;
 static void *mkshort_handle;
 
 static void 
-rd_init(const char *fname, const char *args)
+rd_init(const char *fname)
 {
     file_in = fopen(fname, "r");
     if (file_in == NULL) {
@@ -58,7 +58,7 @@ rd_deinit(void)
 }
 
 static void 
-wr_init(const char *fname, const char *args)
+wr_init(const char *fname)
 {
     file_out = fopen(fname, "w");
     if (file_out == NULL) {
diff --git a/gpsbabel/tpg.c b/gpsbabel/tpg.c
index 0775cf936..44bd48ea9 100644
--- a/gpsbabel/tpg.c
+++ b/gpsbabel/tpg.c
@@ -130,7 +130,7 @@ valid_tpg_header(char * header, int len)
 }
 
 static void
-tpg_rd_init(const char *fname, const char *args)
+tpg_rd_init(const char *fname)
 {
 	tpg_file_in = fopen(fname, "rb");
 	if (tpg_file_in == NULL) {
@@ -145,7 +145,7 @@ tpg_rd_deinit(void)
 }
 
 static void
-tpg_wr_init(const char *fname, const char *args)
+tpg_wr_init(const char *fname)
 {
 	tpg_file_out = fopen(fname, "wb");
 	mkshort_handle = mkshort_new_handle();
diff --git a/gpsbabel/xcsv.c b/gpsbabel/xcsv.c
index b99d5af32..b2e09ceca 100644
--- a/gpsbabel/xcsv.c
+++ b/gpsbabel/xcsv.c
@@ -450,7 +450,7 @@ xcsv_read_internal_style(const char *style_buf)
 }
 
 static void
-xcsv_rd_init(const char *fname, const char *args)
+xcsv_rd_init(const char *fname)
 {
 
     /* 
@@ -479,7 +479,7 @@ xcsv_rd_deinit(void)
 }
 
 static void
-xcsv_wr_init(const char *fname, const char *args)
+xcsv_wr_init(const char *fname)
 {
     /* if we don't have an internal style defined, we need to
      * read it from a user-supplied style file, or die trying.
-- 
2.30.2